From 72e4f39c3f412df60c42154afbe0fd3c913b8e6f Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 28 Feb 2007 09:44:59 +0000 Subject: [PATCH] Loop on actual elfnote array size rather than depending on ELFNOTE_MAX macro. Signed-off-by: Keir Fraser --- tools/python/xen/lowlevel/xc/xc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index db1dc43633..b3dbb20ed7 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -23,6 +23,8 @@ #include #include +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + /* Needed for Python versions earlier than 2.3. */ #ifndef PyMODINIT_FUNC #define PyMODINIT_FUNC DL_EXPORT(void) @@ -419,10 +421,13 @@ static PyObject *pyxc_linux_build(XcObject *self, goto out; } - if (!(elfnote_dict = PyDict_New())) + if ( !(elfnote_dict = PyDict_New()) ) goto out; - for (i = 0; i <= XEN_ELFNOTE_MAX; i++) { - switch (dom->parms.elf_notes[i].type) { + + for ( i = 0; i < ARRAY_SIZE(dom->parms.elf_notes); i++ ) + { + switch ( dom->parms.elf_notes[i].type ) + { case XEN_ENT_NONE: continue; case XEN_ENT_LONG: -- 2.30.2